Cleanup: Minor changes to align with Evernote code

This will minimize conflicts when picking the following commits.