Better trial wave functions in the predefined structures routine