Some renaming and alterations to make double -> float auto-conversion work.