Follow the floating-changes in -language.
Merge pull request #98 from pjonsson/more-floating

Follow the floating-changes in -language.