Revert "silverware: starting cleanup of aspects code"

Overly ambitious change for core code, especially given the poor test coverage we have at present. Backing out, will consider options better in the AM.

This reverts commit 93ea235d48fcdff244c41941c9c432951ef44324.