minor cleanup for consistency with 1.4.7