Explicitly order floor updates. Closes #577.