Fix: Extract aspect override into helper method

Squashed commit of the following:

commit 4b7cb37cfd8c97a5584328fc0a7f77940d24d56b
Author: David Snyder <david@infochimps.com>
Date:   Fri Apr 25 14:30:20 2014 -0500

    Extract aspect override into helper method

    Change-Id: I7fb54faa338898489410a95b39487455434cd1f3

Change-Id: Iff4866d3f98d695f173a57da810dfbb0f103c768