Pushed one more commit to address the inconsistency I mentioned above.
Please review.