Simplify, based on Mark Calabretta's suggestion.