Improve float-in somewhat