Simplified units

Fix for #710.