You're duplicating code for minor API enhancements here...