k-Schur expansions of Catalan functions